projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd031b9 800a239)
bitkeeper revision 1.1706 (42a8be4bKG9EZTToo_Pa4wDcO7VpRw)
authordjm@sportsman.spdomain <djm@sportsman.spdomain>
Thu, 9 Jun 2005 22:10:19 +0000 (22:10 +0000)
committerdjm@sportsman.spdomain <djm@sportsman.spdomain>
Thu, 9 Jun 2005 22:10:19 +0000 (22:10 +0000)
Merge http://xen-ia64.bkbits.net/xeno-unstable-ia64.bk
into sportsman.spdomain:/home/djm/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/ia64/domain.c patch | diff1 | diff2 | blob | history
xen/arch/ia64/xensetup.c patch | diff1 | diff2 | blob | history
xen/include/asm-ia64/config.h patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/ia64/domain.c
Simple merge
diff --cc xen/arch/ia64/xensetup.c
Simple merge
diff --cc xen/include/asm-ia64/config.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.